This repository has been archived by the owner on Jan 20, 2022. It is now read-only.
Fix additional peerOptional conflict cases #237
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
isaacs
force-pushed
the
isaacs/fix-peer-optional-eresolve-2
branch
from
cff9aa8 to
9410d16
Compare
|
Note, only Case F is actually broken prior to this commit, but I kept the others for completeness, and to ensure we don't regress in those cases. |
case D ``` root -> (x, z@1) x -> PEEROPTIONAL(y) y -> PEER(z@2) ``` case E ``` root -> (x, z@1) x -> PEEROPTIONAL(y) PEER(z@1) y -> PEER(z@2) ``` case F ``` root -> (x, z@1) x -> PEEROPTIONAL(y) PEER(z@1) PEER(w@1) w -> PEER(z@1) y -> PEER(z@2) ``` Case F properly reproduces the failure seen by installing [email protected] alongside typescript@4. Fix: #236 cc: @kyliau PR-URL: #237 Credit: @isaacs Close: #237 Reviewed-by: @isaacs
isaacs
force-pushed
the
isaacs/fix-peer-optional-eresolve-2
branch
from
9410d16 to
f25367d
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
case D
case E
case F
Case F properly reproduces the failure seen by installing
[email protected] alongside typescript@4.
Fix: #236
cc: @kyliau